From 1bb487a2c70f5bffa69d191d93da4c1ad466c05e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 20 Feb 2006 17:57:09 +0000 Subject: [PATCH] Obtain the background color from the gc when it is needed. (#331820) 2006-02-20 Matthias Clasen * gdk/gdkgc.c (_gdk_gc_update_context): Obtain the background color from the gc when it is needed. (#331820) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gdk/gdkgc.c | 8 ++------ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 04ec08cbad..5589ba333f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-02-20 Matthias Clasen + + * gdk/gdkgc.c (_gdk_gc_update_context): Obtain the + background color from the gc when it is needed. (#331820) + 2006-02-19 Matthias Clasen * gdk/gdkgc.c (_gdk_gc_update_context): Add a gc_changed diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 04ec08cbad..5589ba333f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-02-20 Matthias Clasen + + * gdk/gdkgc.c (_gdk_gc_update_context): Obtain the + background color from the gc when it is needed. (#331820) + 2006-02-19 Matthias Clasen * gdk/gdkgc.c (_gdk_gc_update_context): Add a gc_changed diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c index 066f0c57d1..664d5a03cc 100644 --- a/gdk/gdkgc.c +++ b/gdk/gdkgc.c @@ -1152,12 +1152,8 @@ _gdk_gc_update_context (GdkGC *gc, } if (fill == GDK_OPAQUE_STIPPLED) - { - if (override_foreground) - foreground = *override_foreground; - else - gc_get_background (gc, &background); - } + gc_get_background (gc, &background); + switch (fill) { -- 2.30.2